Merge branch 'master' of github.com:SiriDB/siridb-server into itest
authorJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 5 Oct 2018 20:40:48 +0000 (22:40 +0200)
committerJeroen van der Heijden <jeroen@transceptor.technology>
Fri, 5 Oct 2018 20:40:48 +0000 (22:40 +0200)

Trivial merge